Fix invalid specification of default_value without regard to default_value_type #1631
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdickinson
commented
Apr 19, 2022
corranwebster
approved these changes
Apr 19, 2022
rahulporuri
reviewed
Apr 20, 2022
| @@ -3064,6 +3064,22 @@ _trait_set_default_value(trait_object *trait, PyObject *args) | |||
| return NULL; | |||
There was a problem hiding this comment.
this is tangential but while looking up the difference between PyErr_Format and PyErr_SetString, I came across the fact that PyErr_Format returns NULL - so we don't need to explicitly return so we can do NULL herereturn PyErr_Format(...). Right? Or is the convention not to do so?
Ref https://docs.python.org/3/c-api/exceptions.html#c.PyErr_Format
There was a problem hiding this comment.
Yes, we could! Not in this PR, but I'd be happy to look at a PR that made this and similar cleanups across ctraits.c.
4 tasks
mdickinson
added a commit
that referenced
this pull request
Aug 9, 2022
…value_type (#1631) This is a two-part fix for #1629: - Part 1: fix `ctraits.c` to validate the input to `set_default_value` in the case where the given default value type is `DefaultValue.callable_and_args`. This fixes the segfault reported in #1629, replacing it with a more scrutable Python-level exception. - Part 2: in the `TraitType.clone` base class implementation, when we set a default value, also set the default value type to be consistent with that default value. This still leaves open the possibility for `TraitType` subclasses to do their own thing in their `clone` methods (and in particular, the `List`, `Dict` and `Set` trait types will probably want to take advantage of that - see #1630). (cherry picked from commit dc59b5c)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a two-part fix for #1629:
ctraits.cto validate the input toset_default_valuein the case where the given default value type isDefaultValue.callable_and_args. This fixes the segfault reported in ClonedTraitTypesdon't properly account forcallable_and_argsdefaults #1629, replacing it with a more scrutable Python-level exception.TraitType.clonebase class implementation, when we set a default value, also set the default value type to be consistent with that default value. This still leaves open the possibility forTraitTypesubclasses to do their own thing in theirclonemethods (and in particular, theList,DictandSettrait types will probably want to take advantage of that - see Trait inheritance doesn't work as expected for List traits #1630).Checklist
docs/source/traits_api_reference) N/Adocs/source/traits_user_manual) N/Atraits-stubsN/A